merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 2 Sep 2010 01:04:37 +0000 (10:04 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 2 Sep 2010 01:04:37 +0000 (10:04 +0900)
commit6804cbf42c103905d62dcfb558baa11c25aaf567
treea7f1a7f47db7b48e594edb5df8eb7b553acf4ce5
parentfb94f427e7ef46651b3deb9fa12fd1d40f8eeb0b
parent1071b99fda2580cd45b1958e3fe9a3ea979cfe7c
merge trunk